Skip to content

fix(devops): add main→Dev_new_gui sync workflow (#2445)#2482

Merged
mrveiss merged 1 commit intoDev_new_guifrom
fix/issue-2445
Mar 26, 2026
Merged

fix(devops): add main→Dev_new_gui sync workflow (#2445)#2482
mrveiss merged 1 commit intoDev_new_guifrom
fix/issue-2445

Conversation

@mrveiss
Copy link
Owner

@mrveiss mrveiss commented Mar 26, 2026

Closes #2445

Summary

  • New GitHub Actions workflow triggers on push to main
  • Automatically merges main into Dev_new_gui to prevent branch divergence
  • If merge conflicts: aborts cleanly and fails with error for manual resolution

Test plan

  • YAML valid
  • Triggers on push to main only
  • Handles merge conflicts gracefully

When main receives direct commits (hotfixes, Dependabot merges),
this workflow creates a PR to bring Dev_new_gui up to date.
Prevents branch divergence that caused 45 merge conflicts at v0.2.0.
@mrveiss mrveiss merged commit 2c0f99c into Dev_new_gui Mar 26, 2026
2 of 4 checks passed
@mrveiss mrveiss deleted the fix/issue-2445 branch March 26, 2026 19:28
@github-actions
Copy link

✅ SSOT Configuration Compliance: Passing

🎉 No hardcoded values detected that have SSOT config equivalents!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant